Fix the Emoji chooser finalize
authorMatthias Clasen <mclasen@redhat.com>
Wed, 12 Feb 2020 19:23:01 +0000 (14:23 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Wed, 12 Feb 2020 19:23:01 +0000 (14:23 -0500)
If the Emoji chooser is finalized before the idle
has run, it would spew criticals, breaking some tests.
Avoid that.

gtk/gtkemojichooser.c

index 00a9edc262dd755d8b9ea9ece7c32cf831c0a4de..36d3e35cfce09fc6afc530579c011f6dbaed1314 100644 (file)
@@ -110,8 +110,8 @@ gtk_emoji_chooser_finalize (GObject *object)
   if (chooser->populate_idle)
     g_source_remove (chooser->populate_idle);
 
-  g_variant_unref (chooser->data);
-  g_object_unref (chooser->settings);
+  g_clear_pointer (&chooser->data, g_variant_unref);
+  g_clear_object (&chooser->settings);
 
   G_OBJECT_CLASS (gtk_emoji_chooser_parent_class)->finalize (object);
 }